bitkeeper revision 1.1159.1.172 (41542610ZBPAMBCg2f-D1VTZ8pdChw)

Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk

diff --cc linux-2.4.27-xen-sparse/arch/xen/config.in
Simple merge

diff --cc linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
index 08f1619f2e166f7cd8806c079181a0d0c514b6dc,c0445ac420b04d6e122e1224926b5b825bb359a2..6e66c3c9af7adfc36798801d0fedd333ca7a2c60
--- 1/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
--- 2/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
+++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU
@@@ -12,11 -12,9 +12,13 @@@ CONFIG_UID16=
  #
  # CONFIG_XEN_PRIVILEGED_GUEST is not set
  # CONFIG_XEN_PHYSDEV_ACCESS is not set
 +# CONFIG_XEN_BLKDEV_BACKEND is not set
 +# CONFIG_XEN_NETDEV_BACKEND is not set
 +CONFIG_XEN_BLKDEV_FRONTEND=y
 +CONFIG_XEN_NETDEV_FRONTEND=y
  CONFIG_XEN_SCRUB_PAGES=y
+ CONFIG_XEN_NETDEV_FRONTEND=y
+ CONFIG_XEN_BLKDEV_FRONTEND=y
  CONFIG_NO_IDLE_HZ=y
  # CONFIG_FOREIGN_PAGES is not set
  CONFIG_NETDEVICES=y

diff --cc linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c
Simple merge